meson: Install libgtk and libgdk

diff --git a/gdk/meson.build b/gdk/meson.build
index 9101bd8cddb693b646697b571b8eec0c7f1d166a..cd5d4cbe2f19656e688986a573b84d5be0396a3c 100644 (file)
--- a/gdk/meson.build
+++ b/gdk/meson.build
@@ -368,6 +368,7 @@ libgdk = shared_library('gdk',
   c_args: ['-DHAVE_CONFIG_H', '-DGDK_COMPILATION'],
   include_directories: [confinc, xinc, wlinc],
   dependencies: gdk_deps,
+  install: true
 )
 
 

diff --git a/gtk/meson.build b/gtk/meson.build
index 80ad82d87382819aede94b4ca9a6f6ae8f60bcf0..34ce8e65e2df9c32b9e1e241af0d903c2f0529b1 100644 (file)
--- a/gtk/meson.build
+++ b/gtk/meson.build
@@ -749,8 +749,7 @@ typefuncs = custom_target(
   output : 'gtktypefuncs.c',
   input  : gdk_headers + gtk_public_h_sources + gtk_deprecated_type_headers + gtk_private_h_sources + [gtktypebuiltins_h] + [gdkenum_h],
   command: [gentypefuncs_prog, '@OUTPUT@', '@INPUT@'],
-  install: true,
-  install_dir: '.'
+  install: false,
 )
 
 cdata = configuration_data()
@@ -841,6 +840,7 @@ libgtk = shared_library('gtk',
   c_args: gtk_cargs,
   include_directories: [ confinc, gdkinc, gtkinc ],
   dependencies: [gtk_deps, libgdk_dep],
+  install: true
 )
 
 libgtk_dep = declare_dependency(

diff --git a/tests/meson.build b/tests/meson.build
index 2a33d7c0654b3673a0f4666ec2a35c1cc4004397..714a279ff189fca7d1599109638f72f1a2ffd245 100644 (file)
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -1,6 +1,5 @@
 
 test_popover = executable('testpopover', 'testpopover.c', dependencies: libgtk_dep)
-install_data('popover.ui', install_dir: meson.build_root())
 
 test_cairo = executable('testcairo', 'testcairo.c', dependencies: libgtk_dep)
 test_animated_resizing = executable('animated-resizing',

diff --git a/testsuite/gtk/meson.build b/testsuite/gtk/meson.build
index 51986f2c60028df566589e0331394dcfce381b4b..a11db7be764c75ccb3ba3cf8a0fc29351faf6a9f 100644 (file)
--- a/testsuite/gtk/meson.build
+++ b/testsuite/gtk/meson.build
@@ -17,7 +17,6 @@ test('gtk/bitmask test', test_bitmask)
 test_builder = executable('builder', 'builder.c', dependencies: libgtk_dep)
 test('gtk/builder test', test_builder)
 
-install_subdir('ui', install_dir: '.')
 test_builderparser = executable(
   'builderparser',
   'builderparser.c',